auto merge of #323 : alexcrichton/cargo/issue-314, r=wycats
authorbors <bors@rust-lang.org>
Mon, 4 Aug 2014 20:59:32 +0000 (20:59 +0000)
committerbors <bors@rust-lang.org>
Mon, 4 Aug 2014 20:59:32 +0000 (20:59 +0000)
Closes #314


Trivial merge